]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
ctrlAltTab: Ignore DOCK windows without app
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 2 May 2024 15:59:11 +0000 (17:59 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Thu, 2 May 2024 17:12:46 +0000 (19:12 +0200)
The fallback path broke when we removed support for window icons.

Nowadays we track all windows, and as a result should always have an
associated app (although not necessarily backed by a .desktop file),
so this shouldn't make a difference in practice. Not to mention that
external docks (like cairo-dock) are extremely rare themselves now.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3295>

js/ui/ctrlAltTab.js

index a802501b2e08b5d3300af8d28b9af4b7fe630955..68d491638aa8f532533952f3ddc4aac0fe5ad990 100644 (file)
@@ -90,22 +90,14 @@ export class CtrlAltTabManager {
             let windows = display.get_tab_list(Meta.TabList.DOCKS,
                 activeWorkspace);
             let windowTracker = Shell.WindowTracker.get_default();
-            let textureCache = St.TextureCache.get_default();
             for (let i = 0; i < windows.length; i++) {
                 let icon = null;
                 let iconName = null;
                 if (windows[i].get_window_type() === Meta.WindowType.DESKTOP) {
                     iconName = 'shell-focus-desktop-symbolic';
                 } else {
-                    let app = windowTracker.get_window_app(windows[i]);
-                    if (app) {
-                        icon = app.create_icon_texture(POPUP_APPICON_SIZE);
-                    } else {
-                        icon = new St.Icon({
-                            gicon: textureCache.bind_cairo_surface_property(windows[i], 'icon'),
-                            icon_size: POPUP_APPICON_SIZE,
-                        });
-                    }
+                    const app = windowTracker.get_window_app(windows[i]);
+                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                 }
 
                 items.push({